@WebSnke do you see a "resolve conflicts" button like this?

This usually occurs when git can't tell if a line should be added or replaced. In this repo almost always added, as in this PR. If you can resolve the conflict that would be helpful. See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

@WebSnke do you see a "resolve conflicts" button like this?

This usually occurs when git can't tell if a line should be added or replaced. In this repo almost always added, as in this PR. If you can resolve the conflict that would be helpful. See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

Thanks, I just resolved the issue.

Thanks. Some of your other unmerged PRs also have conflicts.

Thanks. Some of your other unmerged PRs also have conflicts.

Thanks, I just resolved all of them.